Skip to content

Conversation

@Zalathar
Copy link
Member

This special case dates all the way back to the original introduction of the wasm32-unknown-unknown target, in #45905.

Either it isn't needed, in which case we should remove it, or it is needed, in which case we should fix the directives in any affected tests.

Note that while the intent of this code was presumably to make //@ ignore-emscripten also ignore tests on w32-u-u, it has the unfortunate side-effect of also causing //@ only-emscripten tests to run on w32-u-u, which is potentially very confusing.

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Nov 15, 2025
@Zalathar
Copy link
Member Author

@bors try jobs=test-various,dist-various-1

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Nov 15, 2025
Don't apply "emscripten" directives to `wasm32-unknown-unknown`

try-job: test-various
try-job: dist-various-1
@Zalathar Zalathar changed the title Don't apply "emscripten" directives to wasm32-unknown-unknown compiletest: Don't apply "emscripten" directives to wasm32-unknown-unknown Nov 15, 2025
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-bors
Copy link

rust-bors bot commented Nov 15, 2025

☀️ Try build successful (CI)
Build commit: 25d016f (25d016f0be5edd6e3aeefcca2ab9ad33f916d18a, parent: 733108b6d4acaa93fe26ae281ea305aacd6aac4e)

@Zalathar Zalathar marked this pull request as ready for review November 15, 2025 12:58
@rustbot
Copy link
Collaborator

rustbot commented Nov 15, 2025

compiletest directives have been modified. Please add or update docs for the
new or modified directive in src/doc/rustc-dev-guide/.

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 15, 2025
@rustbot
Copy link
Collaborator

rustbot commented Nov 15, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@saethlin
Copy link
Member

Is w32-u-u even tested? I think it was replaced by w32-wasip1 in test-various?

@Zalathar
Copy link
Member Author

Is w32-u-u even tested? I think it was replaced by w32-wasip1 in test-various?

The only reference to wasm32-unknown-unknown I can find in src/ci is in src/ci/docker/host-x86_64/dist-various-2/Dockerfile, which appears to only run x dist.

So I suspect the w32uu target is not actually tested anywhere in our CI. Which I guess makes sense for a tier 2 target.

@Zalathar
Copy link
Member Author

Does #146881 (comment) mean that w32uu is already broken when trying to run the full test suite?

Because if it's already broken (and therefore untested), then that makes me even more keen to remove a compiletest special case that doesn't seem to be helping anybody.

@saethlin
Copy link
Member

I agree that the special case isn't helping. I think in one case the target is broken, in the other it's the test.

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I agree, this implication has always striken me as being... weird. If a test has to be ignored for wasm32-u-u and emscripten, that should use two directives, or use something like target-arch based ignores.

View changes since this review

@jieyouxu
Copy link
Member

r? me @bors r+ rollup

@bors
Copy link
Collaborator

bors commented Nov 16, 2025

📌 Commit 069a905 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 16, 2025
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 16, 2025
@rustbot
Copy link
Collaborator

rustbot commented Nov 16, 2025

The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes.

cc @BoxyUwU, @jieyouxu, @Kobzol, @tshepang

@rustbot rustbot added the A-rustc-dev-guide Area: rustc-dev-guide label Nov 16, 2025
@Zalathar
Copy link
Member Author

Realised that this PR obsoleted some text in the dev guide, so I pushed a trivial update to remove it.

@bors r=jieyouxu

@bors
Copy link
Collaborator

bors commented Nov 16, 2025

📌 Commit e53f79d has been approved by jieyouxu

It is now in the queue for this repository.

- Environment (fourth word of the target triple): `gnu`, `msvc`, `musl`
- WASM: `wasm32-bare` matches `wasm32-unknown-unknown`. `emscripten` also
matches that target as well as the emscripten targets.
- WASM: `wasm32-bare` matches `wasm32-unknown-unknown`.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This alias also dates back to the introduction of wasm32-unknown-unknown, and doesn't seem to serve any useful purpose compared to just writing the actual target name.

I'll leave its removal to a follow-up PR.

bors added a commit that referenced this pull request Nov 16, 2025
Rollup of 3 pull requests

Successful merges:

 - #145954 (stabilize extern_system_varargs)
 - #148962 (fix(span): track unnormalized source len for dep-info)
 - #148969 (compiletest: Don't apply "emscripten" directives to `wasm32-unknown-unknown`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 943b80e into rust-lang:main Nov 16, 2025
11 checks passed
rust-timer added a commit that referenced this pull request Nov 16, 2025
Rollup merge of #148969 - Zalathar:wasm32-uwu, r=jieyouxu

compiletest: Don't apply "emscripten" directives to `wasm32-unknown-unknown`

This special case dates all the way back to the original introduction of the `wasm32-unknown-unknown` target, in #45905.

Either it isn't needed, in which case we should remove it, or it *is* needed, in which case we should fix the directives in any affected tests.

Note that while the intent of this code was presumably to make `//@ ignore-emscripten` also ignore tests on w32-u-u, it has the unfortunate side-effect of also causing `//@ only-emscripten` tests to *run* on w32-u-u, which is potentially very confusing.
@rustbot rustbot added this to the 1.93.0 milestone Nov 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-compiletest Area: The compiletest test runner A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants